From fec0543a2cb61d16bec0e9b247b7f1afbe1bee72 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 16 Nov 2007 17:05:20 +0000 Subject: [PATCH] xentrace: Fix TypeError handling of xentrace_format. Signed-off-by: Yosuke Iwamatsu --- tools/xentrace/xentrace_format | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format index 43ea46ebbe..20fa7718ce 100644 --- a/tools/xentrace/xentrace_format +++ b/tools/xentrace/xentrace_format @@ -198,10 +198,15 @@ while not interrupted: if defs.has_key(str(event)): print defs[str(event)] % args else: - if defs.has_key(str(0)): print defs[str(0)] % args + if defs.has_key(str(0)): print defs[str(0)] % args except TypeError: - print defs[str(event)] - print args + if defs.has_key(str(event)): + print defs[str(event)] + print args + else: + if defs.has_key(str(0)): + print defs[str(0)] + print args except IOError, struct.error: sys.exit() -- 2.30.2